Add a Makefile rule for running gitmerge

* Makefile.in (GITMERGE_EMACS, GITMERGE_NMIN): New variables.
(gitmerge): New phony target.

diff --git a/Makefile.in b/Makefile.in
index 3f46d0acafaa0472b688c98f5d56762a43bbb0df..75a501a66080609917677a0883ab1aaf3d2bf840 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1155,3 +1155,13 @@ check-declare:
          exit 1; \
        fi
        $(MAKE) -C lisp $@
+
+.PHONY: gitmerge
+
+GITMERGE_EMACS = ./src/emacs${EXEEXT}
+GITMERGE_NMIN = 10
+
+gitmerge:
+       ${GITMERGE_EMACS} -batch --no-site-file --no-site-lisp \
+         -l ${srcdir}/admin/gitmerge.el \
+         --eval '(setq gitmerge-minimum-missing ${GITMERGE_NMIN})' -f gitmerge